Skip to content

Sync upstream wa-sqlite 1.1.1 - #4

Merged
marcus-pousette merged 115 commits into
masterfrom
sync/upstream-1.1.1
Jul 15, 2026
Merged

Sync upstream wa-sqlite 1.1.1#4
marcus-pousette merged 115 commits into
masterfrom
sync/upstream-1.1.1

Conversation

@marcus-pousette

@marcus-pousette marcus-pousette commented Jul 15, 2026

Copy link
Copy Markdown
Owner

Why

The TreeCRDT fork is based on wa-sqlite 1.0.9. This sync brings it to upstream 1.1.1 and SQLite 3.53, including OPFSWriteAheadVFS and upstream OPFS/WAL correctness fixes.

What changes

  • Merge current rhashimoto/wa-sqlite:master into the fork.
  • Resolve the Makefile conflict from upstream while retaining the generic downstream hooks TreeCRDT needs: DIST_DIR, VPATH_EXTRA, CFILES_EXTRA, DEPS_EXTRA, and LIBS_EXTRA.
  • Use upstream's checked-in distribution artifacts. TreeCRDT builds its extension-linked artifacts into a separate output directory.

Relative to current upstream, the resulting fork differs only in the Makefile hooks above.

Merge order

Merge this PR first with Create a merge commit so both upstream and fork ancestry are preserved. Then retarget #2 to master and merge it.

stevensJourney and others added 30 commits January 6, 2026 08:52
* Clear retryOps on error (rhashimoto#59)
[Fix] OPFS Potential Deadlocks rhashimoto#56

* Update src/examples/OPFSCoopSyncVFS.js

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* Reset dist/ to upstream/master

* remove async and await from releaseAccessHandle

---------

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Bumps [qs](https://github.com/ljharb/qs) from 6.11.2 to 6.14.1.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.11.2...v6.14.1)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…yarn/qs-6.14.1

Bump qs from 6.11.2 to 6.14.1
Bumps [basic-ftp](https://github.com/patrickjuchli/basic-ftp) from 5.0.4 to 5.2.0.
- [Release notes](https://github.com/patrickjuchli/basic-ftp/releases)
- [Changelog](https://github.com/patrickjuchli/basic-ftp/blob/master/CHANGELOG.md)
- [Commits](patrickjuchli/basic-ftp@v5.0.4...v5.2.0)

---
updated-dependencies:
- dependency-name: basic-ftp
  dependency-version: 5.2.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…arations

Fix type declarations for VFS.Base.
…yarn/basic-ftp-5.2.0

Bump basic-ftp from 5.0.4 to 5.2.0
This reverts commit 45f34088fb936ebb60da4c475ab539b67778d639.
shoestringr and others added 24 commits April 9, 2026 19:36
Bumps [basic-ftp](https://github.com/patrickjuchli/basic-ftp) from 5.2.0 to 5.2.2.
- [Release notes](https://github.com/patrickjuchli/basic-ftp/releases)
- [Changelog](https://github.com/patrickjuchli/basic-ftp/blob/master/CHANGELOG.md)
- [Commits](patrickjuchli/basic-ftp@v5.2.0...v5.2.2)

---
updated-dependencies:
- dependency-name: basic-ftp
  dependency-version: 5.2.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…yarn/basic-ftp-5.2.2

Bump basic-ftp from 5.2.0 to 5.2.2
Fix manual checkpoint in exclusive locking mode.
Bumps [qs](https://github.com/ljharb/qs) from 6.15.0 to 6.15.2.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.15.0...v6.15.2)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.15.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [tar](https://github.com/isaacs/node-tar) from 7.5.13 to 7.5.19.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](isaacs/node-tar@v7.5.13...v7.5.19)

---
updated-dependencies:
- dependency-name: tar
  dependency-version: 7.5.19
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants